From e36dd2f4e3df550c94bd8379f7b14a431d31a746 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 6 Jul 2008 06:08:48 +0000 Subject: [PATCH] =?utf8?q?Bug=20539248=20=E2=80=93=20gtk=5Fcalender=5Fquer?= =?utf8?q?y=5Ftooltip=20calls=20->detail=5Ffunc=20with=20invalid?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 2008-07-06 Matthias Clasen Bug 539248 – gtk_calender_query_tooltip calls ->detail_func with invalid dates * gtk/gtkcalendar.c (gtk_calendar_query_tooltip): Check that the cursor is over a valid date before retrieving its details. Patch by Chris Wilson svn path=/trunk/; revision=20789 --- ChangeLog | 9 +++++++++ gtk/gtkcalendar.c | 5 +++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6788ff9f50..a348946ab9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2008-07-06 Matthias Clasen + + Bug 539248 – gtk_calender_query_tooltip calls ->detail_func with + invalid dates + + * gtk/gtkcalendar.c (gtk_calendar_query_tooltip): + Check that the cursor is over a valid date before retrieving + its details. Patch by Chris Wilson + 2008-07-06 Matthias Clasen Bug 493008 – gdk_screen_get_window_stack is not 64-bit-compatible diff --git a/gtk/gtkcalendar.c b/gtk/gtkcalendar.c index 29f786717a..a1c73bb22e 100644 --- a/gtk/gtkcalendar.c +++ b/gtk/gtkcalendar.c @@ -1711,8 +1711,9 @@ gtk_calendar_query_tooltip (GtkWidget *widget, col = calendar_column_from_x (calendar, x - x0); row = calendar_row_from_y (calendar, y - y0); - if (0 != (priv->detail_overflow[row] & (1 << col)) || - 0 == (calendar->display_flags & GTK_CALENDAR_SHOW_DETAILS)) + if (col != -1 && row != -1 && + (0 != (priv->detail_overflow[row] & (1 << col)) || + 0 == (calendar->display_flags & GTK_CALENDAR_SHOW_DETAILS))) { detail = gtk_calendar_get_detail (calendar, row, col); calendar_day_rectangle (calendar, row, col, &day_rect); -- 2.30.2